extensions-app: Include commit hash in nightly version

It's useful information for development snapshots, so include
it when building from a git checkout.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3612

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1661>

diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build
index 3b541592126a1ef4a042865f2e5c86531294d1b0..f311db6e05c3b20cf69fbb9e1bbef5d745479fcb 100644 (file)
--- a/subprojects/extensions-app/js/meson.build
+++ b/subprojects/extensions-app/js/meson.build
@@ -1,7 +1,11 @@
 launcherconf = configuration_data()
 launcherconf.set('app_id', app_id)
 launcherconf.set('PACKAGE_NAME', package_name)
-launcherconf.set('PACKAGE_VERSION', meson.project_version())
+if vcs_tag != ''
+  launcherconf.set('PACKAGE_VERSION', '@0@ (@1@)'.format(package_version, vcs_tag))
+else
+  launcherconf.set('PACKAGE_VERSION', package_version)
+endif
 launcherconf.set('prefix', prefix)
 launcherconf.set('libdir', libdir)
 launcherconf.set('pkgdatadir', pkgdatadir)

diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index c68dfb1b1fdd32924f2b1437b068d29dbac445c1..7e2d56b3ced34de10d15038d785fb53f32162e12 100644 (file)
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
@@ -6,8 +6,10 @@ project('gnome-extensions-app',
 
 if get_option('profile') == 'development'
   profile = '.Devel'
+  vcs_tag = run_command('git', 'rev-parse', '--short', '@').stdout().strip()
 else
   profile = ''
+  vcs_tag = ''
 endif
 
 base_id = 'org.gnome.Extensions'